From: awilliam@xenbuild.aw Date: Tue, 25 Jul 2006 18:39:01 +0000 (-0600) Subject: [IA64] fix merge error with xen-unstable.hg X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15786^2~15 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=767a6a16798956c8d27270ea494ec2226d6b79fc;p=xen.git [IA64] fix merge error with xen-unstable.hg Signed-off-by: Alex Williamson --- diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 8d27af904c..05fba845f4 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -31,6 +31,7 @@ GUEST_SRCS-y += xc_load_elf.c GUEST_SRCS-y += xg_private.c GUEST_SRCS-$(CONFIG_POWERPC) += xc_ppc_linux_build.c GUEST_SRCS-$(CONFIG_X86) += xc_linux_build.c +GUEST_SRCS-$(CONFIG_IA64) += xc_linux_build.c GUEST_SRCS-$(CONFIG_MIGRATE) += xc_linux_restore.c xc_linux_save.c GUEST_SRCS-$(CONFIG_HVM) += xc_hvm_build.c